From 2fd0257fbf39305ea63afd784c74c7a3bbbcfa30 Mon Sep 17 00:00:00 2001 From: Zhigang Wang Date: Tue, 20 May 2014 13:30:54 -0400 Subject: [PATCH] tools: install qemu into xen private directory and add rpath for the libraries This patch will prevent our qemu from conflicting with system qemu. Signed-off-by: Zhigang Wang Acked-by: Ian Campbell --- tools/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 992fe3e8e8..63382b16e4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -187,7 +187,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find cd qemu-xen-dir; \ $$source/configure --enable-xen --target-list=i386-softmmu \ $(QEMU_XEN_ENABLE_DEBUG) \ - --prefix=$(PREFIX) \ + --prefix=$(PREFIX)/lib/xen \ + --libdir=$(PREFIX)/lib/xen/lib \ + --includedir=$(PREFIX)/lib/xen/include \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ -I$(XEN_ROOT)/tools/libxc \ @@ -195,7 +197,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find -I$(XEN_ROOT)/tools/xenstore/compat \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ - -L$(XEN_ROOT)/tools/xenstore" \ + -L$(XEN_ROOT)/tools/xenstore \ + -Wl,-rpath=$(PREFIX)/lib/xen/lib" \ --bindir=$(LIBEXEC) \ --datadir=$(SHAREDIR)/qemu-xen \ --localstatedir=/var \ -- 2.30.2